From a7a778c9487738c889b931f7c86f2ccea3da8013 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sun, 18 Jan 2009 10:36:09 +0000 Subject: [PATCH] babl/babl-component.h babl/babl-conversion.h babl/babl-extension.h 2009-01-18 Sven Neumann * babl/babl-component.h * babl/babl-conversion.h * babl/babl-extension.h * babl/babl-format.h * babl/babl-model.h * babl/babl-type.h: allow to disable the defines that were added for backward compatibility by definining BABL_DISABLE_DEPRECATED. * babl/babl-image.h: removed trailing whitespace. svn path=/trunk/; revision=384 --- ChangeLog | 12 ++++++++++++ babl/babl-component.h | 7 ++++++- babl/babl-conversion.h | 7 ++++++- babl/babl-extension.h | 7 ++++++- babl/babl-format.h | 5 +++++ babl/babl-image.h | 4 ++-- babl/babl-model.h | 10 ++++++++-- babl/babl-type.h | 7 ++++++- 8 files changed, 51 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bbb840..320da45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-01-18 Sven Neumann + + * babl/babl-component.h + * babl/babl-conversion.h + * babl/babl-extension.h + * babl/babl-format.h + * babl/babl-model.h + * babl/babl-type.h: allow to disable the defines that were added + for backward compatibility by definining BABL_DISABLE_DEPRECATED. + + * babl/babl-image.h: removed trailing whitespace. + 2009-01-17 Martin Nordholts Add #define babl_foo babl_foo_from_name macros, that should fix diff --git a/babl/babl-component.h b/babl/babl-component.h index fe8b353..f6066e3 100644 --- a/babl/babl-component.h +++ b/babl/babl-component.h @@ -17,7 +17,7 @@ */ #ifndef _BABL_H -#error this file is only to be included by babl.h +#error this file is only to be included by babl.h #endif @@ -29,8 +29,13 @@ BABL_NAMED_CLASS_DECLARE (component); * NULL); */ +#ifndef BABL_DISABLE_DEPRECATED + #define babl_component babl_component_from_name +#endif /* BABL_DISABLE_DEPRECATED */ + + typedef struct { BablInstance instance; diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h index 2e15fef..0cfed82 100644 --- a/babl/babl-conversion.h +++ b/babl/babl-conversion.h @@ -17,7 +17,7 @@ */ #ifndef _BABL_H -#error this file is only to be included by babl.h +#error this file is only to be included by babl.h #endif /****************************************************************/ @@ -31,8 +31,13 @@ BABL_NAMED_CLASS_DECLARE (conversion); * NULL); */ +#ifndef BABL_DISABLE_DEPRECATED + #define babl_conversion babl_conversion_from_name +#endif /* BABL_DISABLE_DEPRECATED */ + + /* Type and Format */ typedef long (*BablFuncLinear) (char *src, char *dst, diff --git a/babl/babl-extension.h b/babl/babl-extension.h index 6aaf6d7..3f1ca34 100644 --- a/babl/babl-extension.h +++ b/babl/babl-extension.h @@ -17,7 +17,7 @@ */ #ifndef _BABL_H -#error this file is only to be included by babl.h +#error this file is only to be included by babl.h #endif /****************************************************************/ @@ -27,8 +27,13 @@ BABL_NAMED_CLASS_DECLARE (extension); * BablExtension objects are only used internally in babl. */ +#ifndef BABL_DISABLE_DEPRECATED + #define babl_extension babl_extension_from_name +#endif /* BABL_DISABLE_DEPRECATED */ + + typedef struct { BablInstance instance; /* path to .so / .dll is stored in instance name */ diff --git a/babl/babl-format.h b/babl/babl-format.h index 05c74cf..90da767 100644 --- a/babl/babl-format.h +++ b/babl/babl-format.h @@ -41,8 +41,13 @@ BABL_NAMED_CLASS_DECLARE (format); * name is used. */ +#ifndef BABL_DISABLE_DEPRECATED + #define babl_format babl_format_from_name +#endif /* BABL_DISABLE_DEPRECATED */ + + typedef struct { BablInstance instance; diff --git a/babl/babl-image.h b/babl/babl-image.h index a7ca108..efc41fe 100644 --- a/babl/babl-image.h +++ b/babl/babl-image.h @@ -17,7 +17,7 @@ */ #ifndef _BABL_H -#error this file is only to be included by babl.h +#error this file is only to be included by babl.h #endif /****************************************************************/ @@ -29,7 +29,7 @@ BABL_CLASS_DECLARE (image); * passed to babl_process, two different babl_process() functions will be * needed for this since the polymorphism cannot be trusted to work on linear * buffers that originate outside babl's control. - * + * * Babl * babl_image_new (BablComponent *component1, * void *data, * int pitch, diff --git a/babl/babl-model.h b/babl/babl-model.h index 9d9b2e2..844c967 100644 --- a/babl/babl-model.h +++ b/babl/babl-model.h @@ -17,7 +17,7 @@ */ #ifndef _BABL_H -#error this file is only to be included by babl.h +#error this file is only to be included by babl.h #endif /****************************************************************/ @@ -34,13 +34,19 @@ BABL_NAMED_CLASS_DECLARE (model); * */ +#ifndef BABL_DISABLE_DEPRECATED + #define babl_model babl_model_from_name +#endif /* BABL_DISABLE_DEPRECATED */ + + typedef struct { BablInstance instance; BablList *from_list; int components; BablComponent **component; - BablType **type; /*< must be doubles, used here for convenience in code */ + BablType **type; /*< must be doubles, + used here for convenience in code */ } BablModel; diff --git a/babl/babl-type.h b/babl/babl-type.h index 314784f..b189582 100644 --- a/babl/babl-type.h +++ b/babl/babl-type.h @@ -17,7 +17,7 @@ */ #ifndef _BABL_H -#error this file is only to be included by babl.h +#error this file is only to be included by babl.h #endif /****************************************************************/ @@ -35,8 +35,13 @@ BABL_NAMED_CLASS_DECLARE (type); * NULL); */ +#ifndef BABL_DISABLE_DEPRECATED + #define babl_type babl_type_from_name +#endif /* BABL_DISABLE_DEPRECATED */ + + typedef struct { BablInstance instance; -- 2.30.2